From: Kenichi Handa <handa@gnu.org>
Date: Thu, 18 Oct 2012 00:00:39 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~686
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=03d24a8276767e9618d073fa92c3a2c55d6962bf;p=emacs.git

merge trunk
---

03d24a8276767e9618d073fa92c3a2c55d6962bf